Refresh patches

diff --git a/debian/patches/0001-use-cmake-install-libdir.patch b/debian/patches/0001-use-cmake-install-libdir.patch
index 8155f75747305da39eaecab7696dc4a9764da316..6743dca1a4c673cca42fa5e7872eeda975cca91e 100644 (file)
--- a/debian/patches/0001-use-cmake-install-libdir.patch
+++ b/debian/patches/0001-use-cmake-install-libdir.patch
@@ -4,21 +4,16 @@ Subject: use-cmake-install-libdir
 
 Update 2021-09-18: Also use GNUInstallDirs.
 
-Last-Update: 2021-09-18
+Last-Update: 2022-12-10
 ---
- CMakeLists.txt | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
+ CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d2ae987..76c2b69 100644
+index ee08591..46b3be9 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -17,10 +17,11 @@
- #
- 
- ######## Project settings
--cmake_minimum_required(VERSION 2.8)
-+cmake_minimum_required(VERSION 3.0.2)
+@@ -21,6 +21,7 @@ cmake_minimum_required(VERSION 3.5)
  set (PACKAGE_NAME opencc)
  project (${PACKAGE_NAME} CXX)
  include (CTest)
@@ -26,7 +21,7 @@ index d2ae987..76c2b69 100644
  
  ######## Options
  option(BUILD_DOCUMENTATION "Use Doxygen to create the HTML based API documentation" OFF)
-@@ -80,7 +81,7 @@ set (DIR_PREFIX ${CMAKE_INSTALL_PREFIX})
+@@ -82,7 +83,7 @@ set (DIR_PREFIX ${CMAKE_INSTALL_PREFIX})
  set (DIR_INCLUDE ${DIR_PREFIX}/include/)
  set (DIR_SHARE ${DIR_PREFIX}/share/)
  set (DIR_ETC ${DIR_PREFIX}/etc/)

diff --git a/debian/patches/0005-Use-system-googletest.patch b/debian/patches/0005-Use-system-googletest.patch
index 8b09b81de8972d44996f40a47263ab80c1ba38b6..9a6da9db8dc5165da3beeab97d72c3516dc828a3 100644 (file)
--- a/debian/patches/0005-Use-system-googletest.patch
+++ b/debian/patches/0005-Use-system-googletest.patch
@@ -3,7 +3,7 @@ Date: Sat, 6 Mar 2021 17:53:25 +0800
 Subject: Use system googletest
 
 Forwarded: not-needed
-Last-Update: 2021-09-18
+Last-Update: 2022-12-10
 ---
  CMakeLists.txt | 2 ++
  1 file changed, 2 insertions(+)
@@ -12,10 +12,10 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 76c2b69..5f9cdcf 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -204,6 +204,8 @@ add_subdirectory(test)
+@@ -206,6 +206,8 @@ add_subdirectory(test)
  if (ENABLE_GTEST)
    if(NOT USE_SYSTEM_GTEST)
-     add_subdirectory(deps/gtest-1.11.0)
+     add_subdirectory(deps/gtest-1.12.1)
 +  else()
 +    add_subdirectory(/usr/src/googletest/googletest ${CMAKE_BINARY_DIR}/googletest-build EXCLUDE_FROM_ALL)
    endif()